bitkeeper revision 1.1301 (425efd40p7ew4Nxd9WYfNILEq8FV8A)
authorkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 14 Apr 2005 23:31:12 +0000 (23:31 +0000)
committerkaf24@firebug.cl.cam.ac.uk <kaf24@firebug.cl.cam.ac.uk>
Thu, 14 Apr 2005 23:31:12 +0000 (23:31 +0000)
commit1b8c6c3938ac70139da01cd47d0fea964520fa9b
treec796ae540c76f1664cfcb0cd278e20070cae3b8e
parent7883c1304a6da45c5430b1f5caf17a769d03d625
parent4544f174a03a62f339574ac059d02de0a1c02e2d
bitkeeper revision 1.1301 (425efd40p7ew4Nxd9WYfNILEq8FV8A)

Merge firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-2.0-testing.bk
into firebug.cl.cam.ac.uk:/local/scratch/kaf24/xen-unstable.bk
linux-2.6.11-xen-sparse/drivers/xen/console/console.c